Carried out further fixes, changing types to auto and adding const

Signed-off-by: Pablo Ariño Muñoz <progpabarino@gmail.com>

diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 4f955d85f60c76f6217dfe2809cf951f13b342e2..870b22f8bbe830b4287c5db3c54e47977724554e 100644 (file)
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -950,7 +950,7 @@ Result<void, QString> SyncJournalDb::setFileRecord(const SyncJournalFileRecord &
     if (!_etagStorageFilter.isEmpty()) {
         // If we are a directory that should not be read from db next time, don't write the etag
         QByteArray prefix = record._path + "/";
-        for (const auto &it : _etagStorageFilter) {
+        for (const auto &it : std::as_const(_etagStorageFilter)) {
             if (it.startsWith(prefix)) {
                 qCInfo(lcDb) << "Filtered writing the etag of" << prefix << "because it is a prefix of" << it;
                 record._etag = "_invalid_";

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index d40b5e59ae5b71cc6b53f8d3bfea33fbbfb1ed5d..92db88f1a69177702b90738ad7b71ec8dc39c481 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -660,7 +660,7 @@ Folder *FolderMan::folder(const QString &alias)
 void FolderMan::scheduleAllFolders()
 {
     const auto folderMapValues = _folderMap.values();
-    for (auto *f : folderMapValues) {
+    for (const auto f : folderMapValues) {
         if (f && f->canSync()) {
             scheduleFolder(f);
         }
@@ -808,7 +808,7 @@ void FolderMan::slotRunOneEtagJob()
 {
     if (_currentEtagJob.isNull()) {
         Folder *folder = nullptr;
-        for (auto *f : std::as_const(_folderMap)) {
+        for (const auto f : std::as_const(_folderMap)) {
             if (f->etagJob()) {
                 // Caveat: always grabs the first folder with a job, but we think this is Ok for now and avoids us having a separate queue.
                 _currentEtagJob = f->etagJob();
@@ -842,7 +842,7 @@ void FolderMan::slotAccountStateChanged()
         qCInfo(lcFolderMan) << "Account" << accountName << "connected, scheduling its folders";
 
         const auto folderMapValues = _folderMap.values();
-        for (auto *f : folderMapValues) {
+        for (const auto f : folderMapValues) {
             if (f
                 && f->canSync()
                 && f->accountState() == accountState) {
@@ -854,7 +854,7 @@ void FolderMan::slotAccountStateChanged()
                                                            "terminating or descheduling sync folders";
 
         const auto folderValues = _folderMap.values();
-        for (auto *f : folderValues) {
+        for (const auto f : folderValues) {
             if (f
                 && f->isSyncRunning()
                 && f->accountState() == accountState) {
@@ -1358,7 +1358,7 @@ QStringList FolderMan::findFileInLocalFolders(const QString &relPath, const Acco
         serverPath.prepend('/');
 
     const auto mapValues = map().values();
-    for (auto *folder : mapValues) {
+    for (const auto folder : mapValues) {
         if (acc && folder->accountState()->account() != acc) {
             continue;
         }
@@ -1706,7 +1706,7 @@ void FolderMan::trayOverallStatus(const QList<Folder *> &folders,
         auto runSeen = false;
         auto various = false;
 
-        for (const auto *folder : std::as_const(folders)) {
+        for (const auto folder : std::as_const(folders)) {
             // We've already seen an error, worst case met.
             // No need to check the remaining folders.
             if (errorsSeen) {
@@ -2009,7 +2009,7 @@ void FolderMan::setIgnoreHiddenFiles(bool ignore)
 {
     // Note that the setting will revert to 'true' if all folders
     // are deleted...
-    for (auto *folder : std::as_const(_folderMap)) {
+    for (const auto folder : std::as_const(_folderMap)) {
         folder->setIgnoreHiddenFiles(ignore);
         folder->saveToSettings();
     }

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 0af106e8bf758abc731709db6c1cb9efa0163f79..a3023bbc3d1b9125b5121de4949f72a2fc4f4353 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -367,7 +367,7 @@ void FolderWizardRemotePath::slotUpdateDirectories(const QStringList &list)
     }
     QStringList sortedList = list;
     Utility::sortFilenames(sortedList);
-    for ( auto path : sortedList) {
+    for (auto path : sortedList) {
         path.remove(webdavFolder);
 
         // Don't allow to select subfolders of encrypted subfolders

diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp
index 0179f0e0d48aab2ec1ee85b5cbeee3ed1d0be094..1d4f2422599afa5580a53fc43848cb36e45e2cde 100644 (file)
--- a/src/gui/ignorelisttablewidget.cpp
+++ b/src/gui/ignorelisttablewidget.cpp
@@ -100,7 +100,7 @@ void IgnoreListTableWidget::slotWriteIgnoreFile(const QString & file)
     // We need to force a remote discovery after a change of the ignore list.
     // Otherwise we would not download the files/directories that are no longer
     // ignored (because the remote etag did not change)   (issue #3172)
-    for (auto *folder : std::as_const(folderMan->map())) {
+    for (const auto folder : std::as_const(folderMan->map())) {
         folder->journalDb()->forceRemoteDiscoveryNextSync();
         folderMan->scheduleFolder(folder);
     }

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 9aa60a4d0351eb0ee3081edf0ee786299d79e6b7..abe5a56b39480e7d6b7d34c77dfcc31cfd88d35c 100644 (file)
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -218,7 +218,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
     // list of top-level folders as soon as possible.
     if (_oldBlackList == QStringList("/")) {
         _oldBlackList.clear();
-        for (QString path : std::as_const(list)) {
+        for (auto path : std::as_const(list)) {
             path.remove(pathToRemove);
             if (path.isEmpty()) {
                 continue;
@@ -249,7 +249,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
     }
 
     Utility::sortFilenames(list);
-    for (QString path : std::as_const(list)) {
+    for (auto path : std::as_const(list)) {
         auto size = job ? job->_folderInfos[path].size : 0;
         path.remove(pathToRemove);
 
@@ -425,7 +425,7 @@ QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem *root) const
     } else {
         // We did not load from the server so we reuse the one from the old black list
         QString path = root->data(0, Qt::UserRole).toString();
-        for (const QString &it : _oldBlackList) {
+        for (const auto &it : _oldBlackList) {
             if (it.startsWith(path))
                 result += it;
         }

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 65553ad25d59df570504b71248639c9f4b5e6ef7..31aba69c318988967cd01976d5a2c4812a1b2ecd 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -350,7 +350,7 @@ void SettingsDialog::customizeStyle()
     QString background(palette().base().color().name());
     _toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, dark, highlightColor, highlightTextColor));
 
-    for (const auto &a : _actionGroup->actions()) {
+    for (const auto a : _actionGroup->actions()) {
         QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette());
         a->setIcon(icon);
         auto *btn = qobject_cast<QToolButton *>(_toolBar->widgetForAction(a));

diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index c55f3d63f28c437470b9441fe0abb20618be2d6f..af9156916c3fe6c55a063b25fb80455a3a3fd945 100644 (file)
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -34,7 +34,7 @@ namespace OCC {
  */
 static void updateFolder(const AccountPtr &account, QStringView path)
 {
-    for (auto *f : std::as_const(FolderMan::instance()->map())) {
+    for (auto f : std::as_const(FolderMan::instance()->map())) {
         if (f->accountState()->account() != account)
             continue;
         auto folderPath = f->remotePath();
@@ -464,7 +464,7 @@ void ShareManager::createShare(const QString &path,
         [=](const QJsonDocument &reply) {
             // Find existing share permissions (if this was shared with us)
             Share::Permissions existingPermissions = SharePermissionAll;
-            for (const QJsonValue &element : reply.object()["ocs"].toObject()["data"].toArray()) {
+            for (const auto &element : reply.object()["ocs"].toObject()["data"].toArray()) {
                 auto map = element.toObject();
                 if (map["file_target"] == path)
                     existingPermissions = Share::Permissions(map["permissions"].toInt());

diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp
index 6d0897e02336871b8d9f12075d86b952cef17208..f0fb09b18b0fb00a19df766b5dd8efa52b27369b 100644 (file)
--- a/src/gui/tray/activitydata.cpp
+++ b/src/gui/tray/activitydata.cpp
@@ -174,7 +174,7 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP
     }
 
     auto actions = json.value("actions").toArray();
-    for (const auto action : actions) {
+    for (const auto &action : actions) {
         activity._links.append(ActivityLink::createFomJsonObject(action.toObject()));
     }
 

diff --git a/src/gui/tray/notificationhandler.cpp b/src/gui/tray/notificationhandler.cpp
index 83e92a024710bdf6b52e778fe9badceede2a55ff..8701edaf4a693ef418f239ec04bea5461fd85d1c 100644 (file)
--- a/src/gui/tray/notificationhandler.cpp
+++ b/src/gui/tray/notificationhandler.cpp
@@ -89,14 +89,14 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
     }
     _preFetchEtagHeader = postFetchEtagHeader;
 
-    auto notifies = json.object().value("ocs").toObject().value("data").toArray();
+    const auto notifies = json.object().value("ocs").toObject().value("data").toArray();
 
     auto *ai = qvariant_cast<AccountState *>(sender()->property(propertyAccountStateC));
 
     ActivityList list;
     ActivityList callList;
 
-    for (const auto element : std::as_const(notifies)) {
+    for (const auto element : notifies) {
         auto json = element.toObject();
         auto a = Activity::fromActivityJson(json, ai->account());
 

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index b3594f9418467d79b1356d2f9483805f342cd775..b1fb5a2f4d5df2e57d49328c482558cfd8edb798 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -937,7 +937,7 @@ void Account::fetchDirectEditors(const QUrl &directEditingURL, const QString &di
 void Account::slotDirectEditingRecieved(const QJsonDocument &json)
 {
     auto data = json.object().value("ocs").toObject().value("data").toObject();
-    auto editors = data.value("editors").toObject();
+    const auto editors = data.value("editors").toObject();
 
     for (const auto &editorKey : editors.keys()) {
         auto editor = editors.value(editorKey).toObject();

diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index 6cd10759feb85e8b0f7a6a232e103c0475c63262..784320dea71b218606b674b286896ccb14220191 100644 (file)
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -447,7 +447,7 @@ void Capabilities::addDirectEditor(DirectEditor* directEditor)
 
 DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType)
 {
-    for (auto* editor : std::as_const(_directEditors)) {
+    for (const auto editor : std::as_const(_directEditors)) {
         if(editor->hasMimetype(mimeType))
             return editor;
     }
@@ -457,7 +457,7 @@ DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType
 
 DirectEditor* Capabilities::getDirectEditorForOptionalMimetype(const QMimeType &mimeType)
 {
-    for (auto* editor : std::as_const(_directEditors)) {
+    for (const auto editor : std::as_const(_directEditors)) {
         if(editor->hasOptionalMimetype(mimeType))
             return editor;
     }

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 04d207224bf7d463797b53cf3ded52eb7f5cc25b..6bb6b75e2668bdbb484ca62cdff8f9c305b6dc2c 100644 (file)
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -406,7 +406,7 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
             } else {
                 char invalid = '\0';
                 constexpr QByteArrayView invalidChars("\\:?*\"<>|");
-                for (char x : invalidChars) {
+                for (const auto x : invalidChars) {
                     if (item->_file.contains(x)) {
                         invalid = x;
                         break;
@@ -2087,7 +2087,7 @@ int ProcessDirectoryJob::processSubJobs(int nbJobs)
     }
 
     int started = 0;
-    for (auto *rj : std::as_const(_runningJobs)) {
+    for (const auto rj : std::as_const(_runningJobs)) {
         started += rj->processSubJobs(nbJobs - started);
         if (started >= nbJobs)
             return started;

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index c3e884d6ac453bf3a3f31a927a54e74b7b9b9da6..135d7ca636553691bcb5cdeeedffb50bed3bad66 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -618,7 +618,7 @@ void OwncloudPropagator::start(SyncFileItemVector &&items)
         }
     }
 
-    for (auto *it : std::as_const(directoriesToRemove)) {
+    for (const auto it : std::as_const(directoriesToRemove)) {
         _rootJob->appendDirDeletionJob(it);
     }
 
@@ -643,7 +643,7 @@ void OwncloudPropagator::startDirectoryPropagation(const SyncFileItemPtr &item,
         // checkForPermissions() has already run and used the permissions
         // of the file we're about to delete to decide whether uploading
         // to the new dir is ok...
-        for (const SyncFileItemPtr &dirItem : items) {
+        for (const auto &dirItem : items) {
             if (dirItem->destination().startsWith(item->destination() + "/")) {
                 dirItem->_instruction = CSYNC_INSTRUCTION_NONE;
                 _anotherSyncNeeded = true;
@@ -1348,7 +1348,7 @@ void PropagatorCompositeJob::finalize()
 qint64 PropagatorCompositeJob::committedDiskSpace() const
 {
     qint64 needed = 0;
-    for (auto *job : std::as_const(_runningJobs)) {
+    for (const auto job : std::as_const(_runningJobs)) {
         needed += job->committedDiskSpace();
     }
     return needed;

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index 2aba796070faec4f45babd3680fe4a3c30f8d92f..90fadd8ee1c3b2e9e982644776b3343c2318a491 100644 (file)
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -277,7 +277,7 @@ public:
     {
         if (!_runningJobs.empty()) {
             _abortsCount = _runningJobs.size();
-            for (auto *j : std::as_const(_runningJobs)) {
+            for (const auto j : std::as_const(_runningJobs)) {
                 if (abortType == AbortType::Asynchronous) {
                     connect(j, &PropagatorJob::abortFinished,
                             this, &PropagatorCompositeJob::slotSubJobAbortFinished);

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 9ca0e25f1ab6b31ed54db7808557787bb57ecc88..92dd47b54b7bf13cb226ca7d749237f6fc65a158 100644 (file)
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -865,7 +865,7 @@ void PropagateUploadFileCommon::abortNetworkJobs(
     };
 
     // Abort all running jobs, except for explicitly excluded ones
-    for (auto *job : std::as_const(_jobs)) {
+    for (const auto job : std::as_const(_jobs)) {
         auto reply = job->reply();
         if (!reply || !reply->isRunning())
             continue;

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index 139a8806e881023e3ec7d170ec7419e4f8f95e47..d1ee8a06f3a963e79847de4a118736739c9fdbba 100644 (file)
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -235,7 +235,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector &items)
     ProblemsMap oldProblems;
     std::swap(_syncProblems, oldProblems);
 
-    for (const SyncFileItemPtr &item : std::as_const(items)) {
+    for (const auto &item : std::as_const(items)) {
         qCInfo(lcStatusTracker) << "Investigating" << item->destination() << item->_status << item->_instruction << item->_direction;
         _dirtyPaths.remove(item->destination());